Skip to contentSkip to conversation

xserver-nodm: change start runlevel from 2 5 to 2 3 4 5

PATCH In review [email protected] 2 participants 4 messages Mar 26, 2013 – Mar 27, 2013

lore
Share & tools
lore
#0 lore raw

cover xserver-nodm: change start runlevel from 2 5 to 2 3 4 5

From: Chen Qi <[email protected]>

The following changes since commit 3c5f4d54d01887a117bf659fc9af6b2b892c2b08:

separatebuilddir.inc: mxsldr should never have been added to this list, remove (2013-03-24 14:03:19 +0000)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib ChenQi/xserver-nodm
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/xserver-nodm

Chen Qi (1):
xserver-nodm: change start runlevel from 2 5 to 2 3 4 5

 .../x11-common/xserver-nodm-init.bb                |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 xserver-nodm: change start runlevel from 2 5 to 2 3 4 5

From: Chen Qi <[email protected]>

This script is intended to start at runlevel 2 3 4 5, as specified in its HEAD INFO area.

The fact that it was not started at runlevel 3 caused splash screen not going away when booting into runlevel 3.

[YOCTO #3904]

---
 .../x11-common/xserver-nodm-init.bb                |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/x11-common/xserver-nodm-init.bb +1 -1
index eab76c5..9faeb99 100644
@@ -26,7 +26,7 @@ do_install() {
 inherit update-rc.d useradd
 
 INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 9 2 3 4 5 . stop 20 0 1 6 ."
 
 # Use fixed Xusername of xuser for now, this will need to be
 # fixed if the Xusername changes from xuser
Signature · 1 line
1.7.9.5
#2 lore raw
Quoted 4 lines · On Tue, 2013-03-26 at 15:18 +0800, [email protected] wrote:

From: Chen Qi <[email protected]>

This script is intended to start at runlevel 2 3 4 5, as specified in its HEAD INFO area.

Perhaps the header is wrong?

Quoted 2 lines

The fact that it was not started at runlevel 3 caused splash screen not going away when booting into runlevel 3.

I thought psplash was meant to timeout and switch to the console, or switch there at boot completion anyway. I suspect the bug is somewhere else.

Cheers,

Richard

Quoted 20 lines

[YOCTO #3904]

---
 .../x11-common/xserver-nodm-init.bb                |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/x11-common/xserver-nodm-init.bb +1 -1
index eab76c5..9faeb99 100644
@@ -26,7 +26,7 @@ do_install() {
 inherit update-rc.d useradd
 
 INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 9 2 3 4 5 . stop 20 0 1 6 ."
 
 # Use fixed Xusername of xuser for now, this will need to be
 # fixed if the Xusername changes from xuser
author
#3 lore raw
Quoted 9 lines · Richard Purdie
Quoted 4 lines · On Tue, 2013-03-26 at 15:18 +0800, [email protected] wrote:

From: Chen Qi <[email protected]>

This script is intended to start at runlevel 2 3 4 5, as specified in its HEAD INFO area.

Perhaps the header is wrong?

Quoted 2 lines

The fact that it was not started at runlevel 3 caused splash screen not going away when booting into runlevel 3.

Quoted 7 lines

I thought psplash was meant to timeout and switch to the console, or switch there at boot completion anyway. I suspect the bug is somewhere else.

Cheers,

Richard

Thank you for reminding me of this.
I've sent another patch to fix this problem.

The root cause is in the rc script.

#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch /*if [ "x$runlevel" != "xS" ] && [ ! -x /etc/init.d/xserver-nodm ]; then*/
if type psplash-write >/dev/null 2>&1; then
TMPDIR=/mnt/.psplash psplash-write "QUIT" || true
umount /mnt/.psplash
fi
fi

So psplash doesn't exit even when xserver-nodm is not started, for example, at runlevel 3.

I changed it to:
/*if [ "x$runlevel" != "xS" ] && [ ! -x /etc/rc${runlevel}.d/S??xserver-nodm ]; then*/

Best Regards,
Chen Qi

Quoted 23 lines
Quoted 20 lines

[YOCTO #3904]

---
  .../x11-common/xserver-nodm-init.bb                |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/x11-common/xserver-nodm-init.bb +1 -1
index eab76c5..9faeb99 100644
@@ -26,7 +26,7 @@ do_install() {
  inherit update-rc.d useradd
 
  INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 9 2 3 4 5 . stop 20 0 1 6 ."
 
  # Use fixed Xusername of xuser for now, this will need to be
  # fixed if the Xusername changes from xuser